merge trunk
authorKenichi Handa <handa@etlken>
Wed, 26 May 2010 00:36:51 +0000 (09:36 +0900)
committerKenichi Handa <handa@etlken>
Wed, 26 May 2010 00:36:51 +0000 (09:36 +0900)
commit8834a5973444e2d125499b2a0630d0a5258e685b
treef80507968484134e72156281a5406c2d6fa44a48
parente376abbdbabfd8fbd39bba522bb965c6f9706c00
parentef2847af1d7eead7f54dcbfc4033f6817a27f743
merge trunk